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

Change-Id: I207de7be71246830bbf01e0c6b126892997ccadc