am bec4abaa: Merge "Fix issue 3302649." into gingerbread

* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.