DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I736603a7f1731b439491b7ec5e3adb014e9395f3