am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread

Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'

* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
  Fix bug 3058324