defaultServiceManager locks before check. am: 8fb656b8ad
am: 3dcf0cf34e

Change-Id: I4176ea8440ad4f32a3659082248d3231fe32e727