am 24c8ac3b: Merge "Fix issue #34143287: A couple panics observed during an...
am 24c8ac3b: Merge "Fix issue #34143287: A couple panics observed during an attempted..." into honeycomb
* commit '24c8ac3b':
Fix issue #34143287: A couple panics observed during an attempted...