DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I82ab4ae5a242c44ec72bba9f2e2f9cf068132d86