Merge "Proto change for dimension from condition."