Merge \\"Don\\'t backup & restore disabled shortcuts.\\" into nyc-mr1-dev am: 4885b274c1
am: bc15e3ca2b

Change-Id: I457db12fdcc884a121b82320b7d32646133632ca