Merge "Prevent sending unnecessary Terminal Response in STK main menu" am: 53941bd072
am: 1608e1a75a

Change-Id: Idb80c397d493bfb9aef6a80e2582e11ddcd48b0f