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

Change-Id: I80a7aece22ccd29ea8e3fee19f217958da4e1698