DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: I0f7d294680477f7ee8b25d2b8622f3ff05bc4f41