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

Change-Id: I4129260cad155e14a849000674c60cb708966c09