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

Bug: 139369544
Change-Id: If2c60e9bc1ed74a5204f42efd04f069f781b7ecf