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

Bug: 132622481
Change-Id: Ied30510c6893efb709ec28e90a10154ca06e2acb