Update for shortcuts

Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
4 files changed