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
am: e1bbcf74
* commit 'e1bbcf74':
Fixes and improvements for SerializationTest