Merge "BUG-868: stop using InstanceIdentifier.builder()"