Merge "Skip verifying empty devices in test_tagged_attachment until bug is fixed"