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

Change-Id: If38c5927bc15071f6f198b4381d4cf6fea6d2bf6