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

Change-Id: Ia36d60d3ccbfcb76a90757625177314ad85754b9