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

Bug: 127812889
Change-Id: I8f2b24ea6125b9f9e4f861d8597eb3f3cd319322