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

Change-Id: I8fcf05f31dff419ed297292639b9b3c66c95fffb