Merge "Fix alphanumeric order in current.txt" am: f11a6ba9c7
am: 9eb33b4f7a

Change-Id: I40f898eca09cc10c4a7273e958c20cc3cd261ce4