DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I1cb1c38609ee26bb7c3e7343a9ed4c85fb4fb0a6