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

Bug: 132622481
Change-Id: I595021c2ed76779db028bf4f46d2548bfa9c4ce5