DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ie9c42785f1e3604d3d8699acf0877d16af4ff5db