Merge "Add instances to sites after removing duplicate ids."
am: e8c91f2d97

Change-Id: Iaea6157c57437632e9e1c5d49868b358e9f7c06f