DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I80e0f58f11d57ef493b4e122a2ad311406e7c403