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