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

Change-Id: Iec6e6ad38e6b960e56c2c0cc389519710f8b7cd7