Merge "Add getInstance call to LazyServiceRegistrar" am: 2a5beb5fb8 am: ee0fc68fff am: d5bca6565d am: 928a6f2118
am: fd713a6951

Change-Id: Iaa5faa4a43ba55d0dc1178724555f367129a7f52