DO NOT MERGE - Skip PPRL.190305.001 into master

Bug: 127812889
Change-Id: I1f44c24a2499fe75a6db2302ff104eedca66144e