DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: Id802777a54701534cc747ebecf5b1f1b79c132be