DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. Bug: 132622481 Change-Id: Ia61363fe39a3846e7f5001068041875f62f94849