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

Change-Id: Ib56e1a8895557d43aadd8eada75dce2d9b836dc9