Merge "Remove broken test testRfc6724Sort" am: e682b1526a am: 79e97b7d21 am: ab5e4c7429
am: 4ef471e59f

Change-Id: Idc6db433585de067e45088b43665c8e37b310397