DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ib699f7951521bcaefb24b745f1578e25246f0a07