Merge "Disable shortcuts per ecc list status."
am: a0521acabf

Change-Id: I305329f616703c44657badc5f2144579b83e505b