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

Change-Id: I36c11ce65a81f60fc4fe998b308e36f5ae243591