Merge "Image space cleanup for app images"
am: 11a4c96a7f

* commit '11a4c96a7f8268a94cbdcbc2771d03bc4f2ce065':
  Image space cleanup for app images