DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I433fe490d32fdedd95a33c3dd9545d722611e6fc