Merge "Fix compilation issues with new kotlin compiler" am: 4fb04e8b7f
am: 8dc0f634c8

Change-Id: Iaf7fdfa8bdceffdec8512b21eaa4b2a1c4a5bfd7