Merge "Fixes and improvements for SerializationTest" into kitkat-cts-dev