DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I8e8b5ca02fa5eeefa26fcfd82d18b61a500855a3