Merge "Source Code fix for ASAN Build" into tizen