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

Bug: 139369544
Change-Id: I24c88d4bc056d8440d6de94488fb3d7fd6ad5200