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