Merge "Extend RollbackManagerService to handle S extensions"