Merge "Fix build error from signed/unsigned comparison"