am 75b1c301: am ed11920c: am 60247737: Merge "Fix build - re-generate current.txt"

* commit '75b1c3011be727acbc862d6684299709756a33bd':
  Fix build - re-generate current.txt