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

Bug: 132622481
Change-Id: I3f8a777574eb05716d4ff18e64c9750184de26b6