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

Change-Id: I6d5d96898b8e7a115d8d3ebe627c8d026ef1da30