[automerger skipped] Fix race conditions for lazy services. am: afa0d58951 am: 2b092f9220 -s ours
am: 926731d441 -s ours
am skip reason: change_id I3ee26ba96dbc9732e72aaa16281abc47ce6a02c9 with SHA1 ea2fb55120 is in history

Change-Id: If4cd2f0794d56039767c503d161cfeea66581e43