am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread

* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB