[automerger skipped] Merge "Fix kotlinc warnings in EasterEgg." am: d913216e27 am: ae21f0b06e -s ours
am: bdda23b4de -s ours
am skip reason: change_id Idab21176ec9e4e61751a87c4aeafe3966ed10a8c with SHA1 455f588927 is in history

Change-Id: Iebdd27b1747bf7297b4a37737ce8fabee68fdc13