DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Id61a17ea8fe0afa0e191caca10ba9a55e001ee6c