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

Bug: 132622481
Change-Id: I8a8791de61a1b74ed5d228bb5c123dc1d38a171f