Merge "Merge "Moving reollback observer tests to presubmit." into main am: 76a8cf40fd am: 328b8763f5" into main