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

Bug: 132622481
Change-Id: If0c7a9fe0a6f3b0abf65d60492c6b2d0a4ce8527