am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread

* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread