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

Change-Id: Iee9c359a05a5a05aa55a2e7bede184b3d5f9ed98