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

* commit '24c8ac3b0912762ce6f3cdadc46c253f407af396':
  Fix issue #3414328: A couple panics observed during an attempted...
tree: 0b8accc2d5b58e5121e60ec38a0a2b829f266455
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE