Don't return archive for disabled services

Change-Id: I31b561fc204f02c8f3417c7a55a429e39b1e1ee8
Merge "Don't return archive for disabled services"