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

Bug: 132622481
Change-Id: Ie3fd0291c011aff50215c1225f558cac182afe6e