Merge "Fix PendingDeprecationWarning for assert*"