Merge "Fix current.txt" am: 2810d0ae3e
am: 26c2c5e50d

Change-Id: I9717d3c4d084498a1b1b23aa0639bc28721ccda1