DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I5394bad5c181525a5d532ad2f3801de3b6857962