Merge "Image: fix typo" into oc-mr1-dev am: ad3a36b13b
am: e85bbc5751

Change-Id: I3e3fda244ada41f6d081d6a369d05345b869193c