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

Bug: 132622481
Change-Id: I94916a878d4db296f02dcd842c3cb49d7e880065