Merge "Update documentation for Image to be clear on valid format enums." into tm-dev