Merge "Fixing the build breakage due to bad merge."