Merge "Label the close image button" into oc-dev
am: c453901d13

Change-Id: Ic7dcf152a9759865619129fb1f3d06dbb75e2921