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

Bug: 132622481
Change-Id: Ia06c568ac282205671c21394d563d1dfd87c0b9e