Support Advance ShortCut

Change-Id: I66aa3854a1a3319b08e2f368e312957c3b826fa7