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

Bug: 132622481
Change-Id: I5c2166d70ff6a1e49c9791932173c36b9e58eca7