DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I7c5ada5c5afe38848be733616cbb1568440ab1c5