am 3447516e: Merge "Fixes and improvements for SerializationTest"

* commit '3447516ed32e3b118c30b47bfe42c4d4152b085d':
  Fixes and improvements for SerializationTest