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

* commit '1ecfcaef5d274d07e3b23c50888845db4f75ede4':
  Image space cleanup for app images