Merge cherrypicks of [5929407, 5929627, 5929597, 5929598] into pi-platform-release

Change-Id: If3e46dabb018bd841b657b8aafa60e399f5cf18b