am ba035dd0: am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread

* commit 'ba035dd049c345e2041e86e262d03940f0bb2699':
  Fix issue 3302649.