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

Change-Id: I580cb33fcf33120fe9b6131685b8527315535a22