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

Change-Id: I710eeb26af40d07d3ee4f70c45a8323cba5861d4