[automerger skipped] Opt adbd and init out of property-watcher thread am: 0fba97d295 am: e1da20f909 -s ours am: ef8e7ca4ed -s ours
am skip reason: Change-Id I0c44e76cc59d12b963e4d5b862683ead2f816cdc with SHA-1 87d1a3bfba is in history

Change-Id: I1e215b0e8d57ba07d8d671b5d75a1ee96738ef47