Merge "Adding validate before switch feature." am: f2cf09c945
am: 86ca0ba02f

Change-Id: Ib886edf8fc3d1fa1703adcc0f91e8dff606face0