Merge "Fixed some a11y issues in MainActivity." am: 1d9fccf02f am: b07c4e720b
am: 79aef77588

Change-Id: Ic0753c272330ce7f73881b5ec7fdbb2ad4b304d0