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

Change-Id: Iace17bcb0eab86649bbf778004a80322d1f37396