Merge "enum operator<<() script fails with do { } while cond;" am: 92ca333976 am: 3fa5bb4480
am: 460b774ea4

* commit '460b774ea49ee63d6bd313fcd774397f4c9cdf96':
  enum operator<<() script fails with do { } while cond;