Merge "Fix pre-submit failure due to cast error."