DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I92a7733be6b1a12e87d8ed066dbd7dba4af5f576