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

Bug: 132622481
Change-Id: Icc638b14d1277a47e2e01526610fddc546b7c574