am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread

Merge commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860'

* commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860':
  Fix issue 3126094.