Merge "Add test for kryo support." am: b27febced6 am: 2844533d0b
am: 9f23dff8c3

Change-Id: I13dd7a43c9997f19c6d380e739502bb6e7f9451d