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

* commit 'da588ba1a82a86d6a7b039df0690e21463d9a694':
  Image space cleanup for app images