DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: Ibaae231023af409e2dfb44b85f5c7e46f219e784