DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ieceaef8b4dd56737a5836dd5e968b609cd084d36