Fix race conditions for lazy services.
am: afa0d58951

Change-Id: Ie694280cf2262f8bd21a96c667d9b888b8742b32