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

Change-Id: I56bb30e3f2203e3c947cd569dce93716916f2190