am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge

* commit '89a11e5d5c3210359679e6f211444e0d7240ae0a':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.