Merge "Deprecate use of BrokenTest and SideEffect"