Merge "Fix race conditions for lazy services." into pi-dev-plus-aosp
am: d589665d83

Change-Id: Icd61000dfb957a253335fda6789474448a962e14