Merge "Add current.txt" into oc-dev
am: 0d260797b4

Change-Id: I5e801e4dbb708cf4178000bf87ac92b4918f7928