DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I39e6d2e8ce1a064cc47bbec3c288093e4a903bec