Also fix the accessibility descriptions (bad merge?). Bug: 4541219 Change-Id: I8a8e2a14e5557c45af0b9e74b0bd654ff804aab9