am 42e449e9: am a798b9f0: Backport (simple cherry-pick) d1624add2b73ce8ff7826ce27b1d6d6e35bb83a6 to gingerbread.

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