DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I060994cb20c1190d50a55c69f8c1413068fb238b