DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master

Bug: 127812889
Change-Id: I6af64f4b2667eb4c0540b23cec899581620fc352