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

Change-Id: Id8d2e2ef4e68b50455799290d58601269ba9af97