Merge "Set RTT capability properly in AccountEntry"