Merge "Fix build following change 0763650"