DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: I3df722649e2d1d8a58a70698052fea71567af9bc