Switch locking strategy

Change-Id: Ibade2a288477f2577c93f73fe70e0b0f1c6a2856