DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

Bug: 139369544
Change-Id: If9b192f2b6d33372c1a255bd9b67fec1ce4fd889