am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev automerge: 660504a

* commit '3e8abdd9bdca823a635aac3adacf71ef227b18e1':
  Fixes and improvements for SerializationTest