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

Bug: 132622481
Change-Id: I40ab5e0794efaff5998296010f42c6aa1cb5e4bf