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

Bug: 132622481
Change-Id: Ie429dff0ad4dac2d9affcefedc2768639c1ddc44