DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I7e1e95d48518ba22d651ac5301f59d0576eae5f3