Merge "Add test for kryo support."
am: b27febced6

Change-Id: I82576c4430df46ff5bc1a7df504ccfd240432c28