Merge "Add guard macro to avoid build break" into tizen