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

Bug: 127812889
Change-Id: I6fb94a96ef1575c3e2efbdc4f0d97719e7ace775