DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I04ff050624b5649a0e840fdc63e531db52240d55