am 100e5753: (-s ours) Update r8b   DO NOT MERGE

* commit '100e5753f54b902b2ca73f18e67a60ca2aa983d5':
  Update r8b   DO NOT MERGE