Change-Id: I42f60976112f20b32eb8ec2d6fb44055aadc735c
元数据结构大调整