DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Id31e5648f8c12372ff1a92ed2262129cabfb9f9e