Merge "Add OTA team as the owner of recovery systems"