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

Change-Id: I22e73483666d2f977da750f2ee9788889fec16ed