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

Change-Id: Ia5c8bc0817fd8e6e5fbfb231f48b5ee1d2234d44