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

Bug: 132622481
Change-Id: Idd1c8a7cb0f5aa1a704d77de60bcb6d54b82101f