Fix concurrency issue in lifetime manager.

Change-Id: I5a057bbb1d1889e03dc424f109fcd0598237cf68