Merge "Mark some odm properties as vendor-init-settable"