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

Change-Id: I11f7501dcf768397acc4cfc74eee58d27013b6a4