Merge "Secondary menu sends unexpected TERMINAL RESPONSE for subsequent command" into pi-dev
am: c29d87a809  -s ours

Change-Id: Icd3ba6eb7d760186729f9caf1c1efd2fadbf038d