Merge "Fix implicit cast." into vp9-preview