Merge "Use static_assert instead of COMPILE_TIME_ASSERT_FUNCTION_SCOPE"