Merge "Add support for input maps"
am: a1b34a8173

Change-Id: I3dafdb93cd675609258ef16ed29374dd2e55e43a