Merge "Add oran a1-adapter feature to oam"