am 38273ce3: (-s ours) am ac2518d1: (-s ours) Merge "Add strlen tests. DO NOT MERGE"

* commit '38273ce3a20537c366dadac6047c77914c498364':
  Add strlen tests. DO NOT MERGE