Merge f28f1de3 - regen current.txt

Change-Id: I7875932a0634542251f53855b4e8620a089de05f