Merge "Add support for input maps" am: a1b34a8173 am: 7ea6e0da74
am: 4cb46d6196

Change-Id: I080bfd02cd2c1bebaee2c369764b5f5617239411