DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ib3c96e517e104004c0aa4f317d9df9f2a36891bc