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

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

Change-Id: Iddc9c0a315acf7220d90f80f77aa22b944e2ae48