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

Bug: 132622481
Change-Id: I30e891f7c482d1614175e5396a5edf6facb69219