am f3ab3c34: Merge change 5833 into donut

Merge commit 'f3ab3c3437f18834ce63542062c2ed7a87a05fca'

* commit 'f3ab3c3437f18834ce63542062c2ed7a87a05fca':
  Fix nit on length of flag constant.