DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I037afee4bc62cb91bd41b46d4f2e55aceda661ef