Merge "Rebrand the term "rollback" to "revert" in apexd"