DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I8e37b387867abf2888f4084eb0fce2d974b45779