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

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