Merge "Improve function to get storage id" into tizen_5.5