Merge "Add @NonNull annotations to (un)setOffHostForService()"
am: 78366e46b2

Change-Id: Ic96cc8e5d438d5083d5ad40e13367d7921f30af3