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

Bug: 132622481
Change-Id: Ia07c069955f50612b6068a004463ec8fb9ef91be