Merge "Fix an issue in assert-max-image-size."
am: d690ca5b8a

Change-Id: Ic60bb93a2daec5164caf584e3988240c2c5d70cc