Merge "Add kryo support." am: 07807a10a2 am: 7c510b9d43
am: 39890f555c

Change-Id: I305a485200075ecd5f0a9f3e3f0dd872c8b589fa