Merge "Set smoke/gate attributes for tests in "identity""