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

Change-Id: If6ee56b7b3ba6e9b407bfd93e76e65dfc9b014df