Merge "ShortcutDemo: Address API rename" into nyc-mr1-dev