DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I72c3dda73ba8840c2f965b9f61f60820e2963e69