Merge "Revert "Fix issues due to updated toolchain.""