DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I13211edda50c7c94a53e7c6d8ed9637235fe1026