[automerger skipped] Merge "Adding validate before switch feature." am: f2cf09c945 am: 86ca0ba02f
am: ad44dd90b1 -s ours
am skip reason: change_id I689aa494f031834b5cee76906922ebdafa9c77ed with SHA1 8d04800b7f is in history

Change-Id: I526bbe9f6405d152c22a1e53ce0bbbc8c7c9505d