Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18 am: 5584ee2131
am: d733ff11ea

Change-Id: I323b294af1ea7b4a86d5eef7bd7670c965e1b5bf