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

Change-Id: I5510ccc04c4b3b1b334d8525bb5c0569d569b5ab