DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I4576393d85cb0d05eeaa4969bc8668236cf4fa4d