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

Bug: 132622481
Change-Id: I0eb919a6e8b49baa62fde915fd5fad27b39dda05