Merge branch 'stable-3.2' * stable-3.2: Add InstanceId dimension, when available Correct unnecessary builder reassignment Change-Id: Ibcff702b27b21507bd8929f2cb90f3dda8a1594b