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

Bug: 132622481
Change-Id: I62a81cb19ebc065a433b090a7491d67b97d38ef7