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

Change-Id: I427a0ad49489fa889fb2afbb58b2f32330da020e