DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I31f2a48a1a33d20a1a3ce1b1165781f4e8ab43b5