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

Change-Id: I06ca33714f6227f8cf86ecce29e1b87df80add6b