DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I984828467d4b84dc151d962b0f1aa8132b78dc39