Merge "ASAN: Remove old list of services"
am: e78accb103

Change-Id: Idad97f477c391ab72f93605c96a48092663f32bf