[automerger skipped] Merge "Fix current.txt" am: 2810d0ae3e am: 26c2c5e50d
am: 9545440334  -s ours

Change-Id: I25c92f96b944c2a9f48b8d47a1b5defadbf57676