Merge cherrypicks of [2296340] into emu-31-release.

Change-Id: I322ceb1d56f25b395631d66ff821f459ccfb7e34