Schema is now automatically selected if there is only one choice.

Change-Id: I4e61addfe8721d9f242dfa078ec5fecc2f0b8d4f