Merge \"Most cats would prefer chicken.\" into nyc-dev
am: d9069f8c9e

Change-Id: If486049672682e842267209469524611587d0b55