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

Change-Id: Ie61c0db82f40015f743bf7455b1c8850337bca7d