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

Bug: 132622481
Change-Id: Iad0582cf5744ee4e62af7ffed97a22ac43daf6a9