DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ia25507b8b6a9c1a43eff0c6226743a1172fb4fbc