am 83ed30e5: am ae0bb04a: Merge "Fix issue 3098850" into gingerbread

Merge commit '83ed30e5e7aab370400657bcdafde2f071de0b54'

* commit '83ed30e5e7aab370400657bcdafde2f071de0b54':
  Fix issue 3098850