Merge "ReolverActivity: try auto launching single choice" into nyc-mr2-dev am: daacf547ac
am: 0a804ff49c

Change-Id: I8f378b98f29aea48773804bb65306c5b6760a758