am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2

* commit '62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
  DO NOT MERGE