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

Change-Id: Ie655ad82d0441aa6ad6fc45a6e63dc2a53338148