Merge "[multibuttonentry] TC modify: wrong testcase Change-Id: I19c42418ca3bb5364fa76...