Optimize images

Change-Id: I8cf0ec50425374e8abb89dcedc9663375e3d1edd
Merge "Optimize images"