Merge "Fix build breakage resulting from change id: Ia1038f45"