Merge "Update docs OAM architecture diagram"