DO NOT MERGE - Merge PPRL.190205.001 into master

Bug: 124234733
Change-Id: I3db6a7deadc7a88e071105be9ddb911da7e9bacd