DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I84f4d413bb3226b93a4950aec81891fbc22f4793