DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ia821afe7c615b94bf689de84de9b6a3377a1a96f