Merge "Deprecate IntentService" am: 17d1d950ec
am: bcdb5c84d3

Change-Id: I74aa58b9d94618b32069460cdbfe7f006c0e2d72