Merge "Image: fix typo" into oc-mr1-dev