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

Bug: 132622481
Change-Id: If13af1e31abded9dd49cca010414432ddcad4d8d