DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ibdf39ce05bae85c50dc12eaa21721857f84381ce