am 3b724c83: am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread

Merge commit '3b724c836b13b320b2b2c492c28660617e0d503e'

* commit '3b724c836b13b320b2b2c492c28660617e0d503e':
  Improve thread safety of input mappers.