DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I90b834b483440832ad988373377403bd0bf94a4c