Merge change 5833 into donut

* changes:
  Fix nit on length of flag constant.