Optimized images

Change-Id: I3ea157c3c98ccbb4625cada9cb6471e863e504c3