Do not apply legacy treatment on shortcuts
Bug: 62617041

Change-Id: I56a04536fe1bcba9912c5da3ce5a9c9b75bc3506
3 files changed