- corrected the missed "switch_" variable naming - optimize imports more Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3
- corrected the missed "switch_" variable naming - optimize imports more Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3