am 039aa81a: Merge "Fix a crash" into honeycomb-mr1

* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash