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

Bug: 132622481
Change-Id: Ib011acb621c18b1a537cf2519b66994a78888b89