DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I06c90bc2fa7292199e3393cb5ca10347a36c9886