DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I403fd6f43fd6664024455dc598becd71e7de3253