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

Bug: 136196576
Change-Id: I16a949662a107bcc1070e6c0f5bbf18a04235458