DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master

Bug: 127812889
Change-Id: I5e6534aa737a2d7fd0e68488a3d8b0a02a43454c