Merge "Fix issue #3414328: A couple panics observed during an attempted..." into honeycomb