DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I269e3add9bbe43f1e45e4b9accddaf201bacd20c