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

Bug: 132622481
Change-Id: I8a3d38c16d3de15514e2418d13d61b57b2cfd907