Merge "Fix issues due to updated toolchain."