DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: Iefbd76b86d586032d3d8582335979dc3358c2269