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

* commit '45b87713e7b0a50ffa369a6e0674580281e37d38':
  Fixes and improvements for SerializationTest