DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I737b7713ecfa941d42f7f17c35846b3b066a7c03