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

Bug: 136196576
Change-Id: I3c51bec85d71b4e76ea1d548b4cc6cf7a7668f0a