am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
  Fix issue #4291805: Tap Fish crashes on launch