DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I3c2498593266da58787648f7a237957ddc2ecaa9