am 1c2911a6: Merge "Fix bug 3061769" into gingerbread

Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769