DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: I2b39b4e249124acaf17cf34b2c74fdbca70810ea