For shortcuts, always apply legacy treatment. b/37357483 Change-Id: I45f373ee0bb9436bc5029c88855ecb80b93fe277