DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Id9d6c1ee611a8cf74c6372fee70bf9fec0a2bfd9