UPSTREAM: <carry>: address review comments through addl prompts

Signed-off-by: Rashmi Gottipati <[email protected]>

Author: rashmigottipati