Merge "Unit tests for "cmd shortcut"" into nyc-mr1-dev