Merge "EasterEgg: Remove unnecessary safe call on a non-null" am: 55e586d859 am: fd6bb58919
am: cebf4d9280

Change-Id: I88daff6cebdff023df5e2c8807763d449e75e044