b01efe5cf6
Contributed by Steve Loughran. Moved the setter and addAncestors to synchronized Change-Id: Ib362c66d1b8c9124eca7db9a44274ac08d0b3be6