Merge "Fix the build breakage due to type mismatch. This change will be rolled back once change ag/10169247 is submitted."