DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ieb484db8de40d74c2bb5928b823f433b2e86695d