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

Change-Id: Ifa8c92f55c0e7e3d59b4590a4ce3e0362536342e