DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ie1b68da3ece6b90377ea3fa761b3b64246f98c0e