am 7ad2993a: Merge "Work-around OS flex differences."

* commit '7ad2993a7bebbca07fae0a594e2681e9be226524':
  Work-around OS flex differences.