Merge "Fix current.txt"
am: 2810d0ae3e

Change-Id: I67eca70fe8d4ef7700e547de54be6d03aca492c7