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

Change-Id: Id9bd0d7cb15a7c04102013f9008abc9ce344d5d2