Work on toolchain problem

Change-Id: I74a5c8149e76fedc8bc4d4e77d6713ef8278525b