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

Bug: 132622481
Change-Id: I55abf4cc84fb551c030717a9f9983a3a6f197852