DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I78dac98a0d72fc8b8fe868c964458a98f5727786