Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2