Merge "Fixes and improvements for SerializationTest" into kitkat-cts-dev am:...
Merge "Fixes and improvements for SerializationTest" into kitkat-cts-dev am: 6f2da389 am: 2873b21e
am: 8e420077
* commit '8e420077':
Fixes and improvements for SerializationTest