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

Change-Id: I84a7d1b5eb89fa5c796e2db7838aee0af9114486