Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e
am: 316610763b

Change-Id: Ie0698991909eb5276be4be9a7e2a65896ff0055a