Merge "Adding owners in smartspace packages"