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

Change-Id: I60e473eea6ea5c1d086783c9d3136163faa849dc