Old code assumed only 2 choices but now we have more. bug:3328196 Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a