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

Change-Id: I23a8e8820551938a57ed47f2524395072969ece1