Merge "LazyServiceRegistrar: Add flag to prevent shutdown" am: 0d899f6c8a am: 74b017b2d9

Change-Id: I1717b14a8cb2f0453ee0ff1d565846fe3c7de3a1