Merge "[automerger skipped] Allow CDD required properties to be absent in VTS. am: da7a4ddabd am: 7473a3f18f am: b09be6916d am: 6930af7faf -s ours am: d77a577661 -s ours am: 88a5eacd17 -s ours" into main