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

* commit '6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
  DO NOT MERGE