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

Bug: 132622481
Change-Id: I4ab302dfde4fb716e7ca5560523d9d488109e4ee