DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I16a546dc24d3cf980ad7ab09895c0d97ee436224