DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: I27b8210937cd1ed59e16bff6b53e47a5b1470ab2