DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I58de3abaf4470eedc91fdd01ca73fce77f0f1bfe