Merge "Fix build breakage by updating current.txt" into klp-modular-dev