Merge "Make sure we call finishProxyOp for null attribution tags." into sc-dev