Merge "Deprecate IntentService"
am: 17d1d950ec

Change-Id: Ica61be3ab8792b517db9b9188fc8bf6c0bbdb7c9