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

Bug: 136196576
Change-Id: I51435cf03e91cb11ea8027b226f8dbf6eb2b1e73