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

Change-Id: Ie3f4429c1d7efefb83cf8289481a37adddd83801