am 0aee1b15: am 53083ab2: Instantiate correct classes for tap&say settings.

* commit '0aee1b150624f4b36e52e47fa97b8a18350d2df5':
  Instantiate correct classes for tap&say settings.