Merge "Update current.txt to fix inconsistencies"
am: 0bde7874cc

Change-Id: I410f1f6a8b92a17d400e0f2d7ed9aa5764f0802d