DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I13bccc848fc7e7d883116c5f7c08079e27ec97a3