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

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