Track usage of {{#target}} as well

Change-Id: I3b12c4d760974c3c8567c65a361f130cf4c61070
Merge "Track usage of {{#target}} as well"