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

Change-Id: Ide083eaefddfa10742602406d4ad02f267719c1e