Merge "Fix clang-tidy performance-faster-string-find warnings" am: 2658a27ac2

Change-Id: I915c52c276e3cbad4398ca34d26ff3ac6ce9762d