Merge "update_engine: Allow to tag sockets." am: 8d48aa7988
am: 255e0ed383

Change-Id: I0eb8cbb506a3b8e8510c57deaf4d32dca60b07a6