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

Bug: 139369544
Change-Id: I57c55a1e4b4e959fce5532d3754a86c71f608b53