Merge "Set RTT capability properly in AccountEntry" am: 65cd287503 am: 224bb43b37
am: 734d68764f

Change-Id: Ia1bb8b50c00fb53ede3e1d6caa0c4002fae110ea