Optimized images

Change-Id: I7fd18fe4072c8d0bf68e4b8f145f84cddc811a1f