Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e
am: 8269eb0d1f

Change-Id: I6d8211ab3825c34e8945a249fb2151a01a3ac371