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

Change-Id: I71193baac96d5936f6e3dd69a7ee37e70d85f898