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

Bug: 136196576
Change-Id: I4f4d036e5a1ed7b21cc816da2b57002902c989b6