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

* commit 'f44abc8e1bb0a958c0f8a04329f99d82683031e1':
  DO NOT MERGE temp fix for NPE