am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2

* commit '6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76':
  DO NOT MERGE temp fix for NPE