Merge "update_engine: Allow to tag sockets."