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

Change-Id: I0704cb0d5f70fc4a785879a6800739ab316d1627