am 8c665807: (-s ours) am 4fc3d2f0: DO NOT MERGE

Merge commit '8c66580759b3085866e1f9f1ca9af1a60220e574'

* commit '8c66580759b3085866e1f9f1ca9af1a60220e574':
  DO NOT MERGE