Merge "Add design spec for API upgrading and ID alignment"