am 306981e8: am d8e4189c: am 2c3be718: am 61d1c8f6: am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev

* commit '306981e8512720ae92b581602072372acb18e888':