Merge "Fix compile error introduced by ag/842950."