DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ifcc89da7794306f6b575b3bc6050af4f1ece340a