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

Bug: 134605042
Change-Id: I4ade3d1851fe90a24f81cfdbc8a7f0c8e747830c