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

Bug: 132622481
Change-Id: Ie0c4fce7d6383122803a1b65dbb0008f6009f870