DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I7381e14ce38867ba5b3424613cacd60b63287979