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

Change-Id: I316c4ab910bfba609a7adb9f40644a1027286ee8