Merge "Make RegisteredServicesCache understand ASEC-based updates"