Merge "image generator: format the java file" am: 860c82a66b
am: 5faf4021c9

Change-Id: I211c108d9136954b13b01f9cfed25a3d37e2392c