DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I4276a04a6718e24347c094928ef5e6ced930d01a