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

Bug: 132622481
Change-Id: I5b601bd068f74d604053a1e03bec7ee3f0268a64