Merge "Make sure that we clear any nested offsets" into mnc-ub-dev