Change image method and field visiting to use templates am: 9d5956a959
am: aa6c4128ba

Change-Id: I58c1469e19ea72d6385bb5c9a261f1b61c82c3b0