[automerger skipped] Merge "Fix compilation issues with new kotlin compiler"...
[automerger skipped] Merge "Fix compilation issues with new kotlin compiler" am: 4fb04e8b am: 8dc0f634 am: 4cdd1e71
am: 06a77e33 -s ours
am skip reason: change_id Id5a85c787876248e610cc668f54e7bd40629d4e0 with SHA1 06c978a4 is in history
Change-Id: Ifd4d20136d3ac73324f067fae7f865252bee755e