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

* commit '7cad54cb8283b67e5d4106112772dc038b7dbb40':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread