Merge "Fix bugs of RTT chat."
am: 7efc1f032c

Change-Id: Ie18d788210e60f8f2253843b5c5b4ed3eb49de38