DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I96d8fdd0e8a40a783a2f4ee91a01dbad44a22956