Merge "Fix defaultServiceManager() locking and retry loop." am: b1e64b4873

Change-Id: I9888bb394149a66abb82704a41aeacd66afa5014