Merge "Fix kotlinc warnings in EasterEgg."
am: d913216e27

Change-Id: Ib0128b40a8087096765b7268eaf2591973feb993