am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread

Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'

* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
  Fix issue 2876124.