Merge "Makes Assistant handles comply with a11y timeouts" into rvc-dev am: aad7d93e am: d3a79681 am: f27c3745 am: 805ce743 Change-Id: I6c0ac83fd7c247b6c4bceec281c5926e32076791