Merge "Fix a crash" into honeycomb-mr1