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

Change-Id: Ifb66f5b4a7adbfe1ad91e5ab6e439ebbc78ad408