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

Change-Id: Ibaddf73eb0ebeccc3baba5cc9e6d83efe3daa175