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

Bug: 132622481
Change-Id: I1c7eddee82c6753f702c230196f2c69a250524fd