Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38