
* commit 'a798b9f0e171643b0bc7bbf79f14cb018689f715': Backport (simple cherry-pick) d1624add2b73ce8ff7826ce27b1d6d6e35bb83a6 to gingerbread.
* commit 'a798b9f0e171643b0bc7bbf79f14cb018689f715': Backport (simple cherry-pick) d1624add2b73ce8ff7826ce27b1d6d6e35bb83a6 to gingerbread.