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

Bug: 132622481
Change-Id: I26d65f59949ab1d43544b98c7d928a4bc2978b44