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

Change-Id: Id9d31a0c5cf41a0bb4a58326faa79511a1d8cc4a