Merge \\\"Fix clang-tidy performance warnings in healthd.\\\" am: b66b16b39a am: 119d41c18e
am: c15b1f9ca0

Change-Id: Iba64d6947e047324c306f5a9f03a8cbb701bf384