Merge "Expose test APIs on ContentInfo and add CTS coverage" into sc-dev