DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I2d2114f5c441a057561cbfdeb7d64f4794a66ff3