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