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

Change-Id: I7d05801270e0a938048a5f2fc505e3cd8630a42d