Merge "Secondary menu sends unexpected TERMINAL RESPONSE for subsequent command"
am: 2105f9956b

Change-Id: Id850dac3076858fd8d088e9e40ae969957dfa2e6