Merge "Include AM owners in AM test owners"