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

Change-Id: I5ec5d8d9bdbe8b595183a4dcd3f47bdb127416f7