Merge "Disable clang-tidy for Effects.cpp" am: 895dc21fbd am: 4148a2542a

Change-Id: I4b4751866dccff277535802f97878973f84a9f88