am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev

* commit 'f86ad679780b7464c522bf48c8b7281a306862bd':