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

Bug: 132622481
Change-Id: Ia7e5491f115cd49ea5aab7d1add93c73292e326f