Merge "Restrict scope of switch Repair Mode" am: 21caf8d65e
am: 71b38a20ef

Change-Id: If23aeef3979ba1ea523a5f86b366f433c616c94f