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

Bug: 127812889
Change-Id: Idddc51e980d089c4923bf3a05dd33b7c94ed1f92