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

Bug: 127812889
Change-Id: Ia01b2b2aec8924fc1523c7dca37068840204fb11