Merge "Fix up kotlin files for footer inlining" into main