Merge "Add @NonNull annotations to (un)setOffHostForService()"