DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I51f9128ce114053b093a4a8c799ebc2e2aafb09a