am e23212bc: Merge "Fix issue 3142808." into gingerbread

* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
  Fix issue 3142808.