DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Iec6cb19e7f5adb1f177c2861f4247957f2023172