Merge "Fix clang-tidy performance-faster-string-find warnings" am: 57fb318ca3 am: 7c0f0d3cec

Change-Id: I181488a9d4c5aed3f62cf497ae6d092fcf27e7f6