am 60a74642: am 24c8ac3b: Merge "Fix issue #3414328: A couple panics observed during an attempted..." into honeycomb

* commit '60a746426c62bf03b3b5fb494a9cddb9b1ae5166':
  Fix issue #3414328: A couple panics observed during an attempted...