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

Bug: 132622481
Change-Id: I59e1ffa624bc3bceccb176086f7547175275f752