DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ie986006f23ae05d80cc1c69eb9fbf20c5bd5d1a7