Merge "Set use_current for current.txt." am: 8f7b63db44 am: 00d5b62742
am: 36b163760a

Change-Id: I55ac2740e265a64f77662000c52dac2f8123b922