BUG=none TEST=Run it, make sure old versions are unmerged. Change-Id: I2a281284fc17e221985c9c2b184a5a23ba90d773