[IMPROV] Use input_choice or input_yn if possible

Change-Id: I17fb04b9467acecffa98856668f4a92b81978509
Merge "[IMPROV] Use input_choice or input_yn if possible"