am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbread

Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e'

* commit '4421784895a58bb7bcf90236a9e443b372b5b80e':
  Fix issue 2952766.