DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Ib53d396a2651013248e3f1a9f0bc68556f747274