DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I92ef763031baa27eb7603b16443bf83239092741