DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: Ia6a5f97d49b70e8941bb101755041ef5a7d77ca0