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

Change-Id: Iaad56a99ebaf396b3056da772e73b7f152a36216