Merge \\"Neko: Sort the kitties\\" into nyc-mr1-dev am: 7959250318
am: fafc4a768f

Change-Id: I01d827e0d824990680e45f5370e2dee9fbe965ba