DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Id628051e8dde2bce29ae874b190b5e25758efe46