Merge "Fixed return Type to avoid potential error in application" into tizen