Merge "Add key maps for tuna keypad. Bug: 5580373" into ics-mr1