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