Merge "Fix null RollbackManager in RollbackHealthObserver and minor todos"