DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I968fc462d86a7e994bf7c2870d2c392143322ec2