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

Change-Id: I627069f3894b13fa38995e9b1d75d56099ae5561