Merge "Add kryo support."
am: 07807a10a2

Change-Id: I777c9ea39e63d2f3365981e786b81d5424564eda