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

Bug: 130175407
Change-Id: I3321aef4e6d95c0d7efca1b7f9b0c605f0b9e477