Use first choice for a default value

At the moment the last option is being used as the default value when
there are multiple choices.  Instead the first option should be used.

Change-Id: I7fde107a2b78e216ffe4d188befb27aa19184766
Merge "Use first choice for a default value"