Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev am: b6fc18aa28
am: d7ddad5dc7

* commit 'd7ddad5dc7f529d64b35188bfc4a32c0e3f3d42e':
  ShortcutDemo: changes for DR API update.

Change-Id: I8942e31415b6700f7301f65f43f43a22a0cca10d