Fix talkback issues

This is merging ag/856152 and ag/856184.

Bug: 26751768
Change-Id: I4cd6c382db623c053178e1980fe9f0408136f47c
3 files changed