Merge "Fix clang-tidy performance warnings." am: 240faf5ef0
am: 644526cfa5

Change-Id: Ic940bfb924b29fb8d033bd0f843492704a2607d8