Merge "[multibuttonentry]merged with opensource (r69583) Change-Id: Iacb6749138e70493...