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

Change-Id: I96a4dbe887b725b458061cfc5d64b42f2e554038