Easier way to handle shortcuts

Change-Id: I91c4a25e961774de0bed51ba986802a1834173f9
2 files changed