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

Bug: 132622481
Change-Id: Ida2e75d3150cf9cd05fb44077c6e6d3e759d615a