Merge "Serialization support for test plans." into ics-mr0