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

Bug: 132622481
Change-Id: I9c6392122d5e64654992bc746cddc6e536ba0d4c