am c26e391d: Merge "Fix comparison between signed and unsigned error on darwin" into mnc-dev

* commit 'c26e391dc4d5643fd6a84467dd09efc7e4757a6c':
  Fix comparison between signed and unsigned error on darwin