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

Change-Id: Id08d6838ae8834243d1209081d69e683c3323495