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

Change-Id: I1da885d1b942c7680dc5131768f7b7bcff31c9f1