DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I011a39036d4478019ffa46e5bbd4b5752e067b86