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

Bug: 127812889
Change-Id: I104af105cc225ae76eb176f227e9dd198f74e4b7